extensionUtils: Remove userExtensionsDir

Make this less stateful

https://bugzilla.gnome.org/show_bug.cgi?id=677586

diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js
index c924af5906c4363ab191580f79f34db2eb48d046..a403cdb7fa39107ed6142052dd51882ee9bdfba0 100644 (file)
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -268,7 +268,6 @@ function initEnvironment() {
 
 function main(argv) {
     initEnvironment();
-    ExtensionUtils.init();
 
     Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
     Gettext.textdomain(Config.GETTEXT_PACKAGE);

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 1065f36935e82702addcd437964e3822bc01d2a3..d08648413cbcc0b0708265e82779159dec8eca72 100644 (file)
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -14,9 +14,6 @@ const ExtensionType = {
     PER_USER: 2
 };
 
-// GFile for user extensions
-var userExtensionsDir = null;
-
 // Maps uuid -> metadata object
 const extensions = {};
 
@@ -152,11 +149,6 @@ function installImporter(extension) {
     _extension = null;
 }
 
-function init() {
-    let userExtensionsPath = GLib.build_filenamev([global.userdatadir, 'extensions']);
-    userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
-}
-
 function scanExtensionsInDirectory(callback, dir, type) {
     let fileEnum;
     let file, info;
@@ -179,8 +171,10 @@ function scanExtensionsInDirectory(callback, dir, type) {
 }
 
 function scanExtensions(callback) {
-    let systemDataDirs = GLib.get_system_data_dirs();
+    let userExtensionsDir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions']));
     scanExtensionsInDirectory(callback, userExtensionsDir, ExtensionType.PER_USER);
+
+    let systemDataDirs = GLib.get_system_data_dirs();
     for (let i = 0; i < systemDataDirs.length; i++) {
         let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
         let dir = Gio.file_new_for_path(dirPath);

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index f83100daf1f0d7825742a3d68abf0ce8c7ed3d63..eda3872417d0e12a035006e08f03e4a993a375fe 100644 (file)
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -66,7 +66,7 @@ function gotExtensionZipFile(session, message, uuid) {
         return;
     }
 
-    let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
+    let dir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));
     try {
         if (!dir.query_exists(null))
             dir.make_directory_with_parents(null);

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index fa2983a19fd579404df50b13d305add027616b39..efb9144ea4cfad15544228a5de42ebda4b0f1098 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -257,8 +257,6 @@ function onEnabledExtensionsChanged() {
 }
 
 function init() {
-    ExtensionUtils.init();
-
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
     enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
 }